merge from trunk

diff --cc configure.ac
Simple merge

diff --cc doc/lispref/Makefile.in
Simple merge

diff --cc doc/lispref/elisp.texi
Simple merge

diff --cc doc/lispref/objects.texi
Simple merge

diff --cc doc/lispref/processes.texi
Simple merge

diff --cc lisp/subr.el
Simple merge

diff --cc src/Makefile.in
Simple merge

diff --cc src/alloc.c
Simple merge

diff --cc src/buffer.c
Simple merge

diff --cc src/buffer.h
Simple merge

diff --cc src/bytecode.c
Simple merge

diff --cc src/data.c
Simple merge

diff --cc src/emacs.c
Simple merge

diff --cc src/eval.c
Simple merge

diff --cc src/lisp.h
Simple merge

diff --cc src/print.c
Simple merge

diff --cc src/process.c
Simple merge

diff --cc src/process.h
Simple merge

diff --cc src/regex.c
Simple merge

diff --cc src/regex.h
Simple merge

diff --cc src/search.c
Simple merge

diff --cc src/window.c
Simple merge